From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 17 Mar 2011 17:48:09 +0000 (+0100)
Subject: Use the new meta_window_move_to_monitor function
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8555
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8282db456b9eac3a6a0afe727dfdf953e0bbf2dc;p=gnome-shell.git

Use the new meta_window_move_to_monitor function

https://bugzilla.gnome.org/show_bug.cgi?id=645032
---

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index be973b60e..3a07585ad 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1401,7 +1401,7 @@ Workspace.prototype = {
             // the move itself could cause a workspace change if the window enters
             // the primary monitor
             if (metaWindow.get_monitor() != this.monitorIndex)
-                metaWindow.move_frame(true, this._x, this._y);
+                metaWindow.move_to_monitor(this.monitorIndex);
 
             let index = this.metaWorkspace ? this.metaWorkspace.index() : global.screen.get_active_workspace_index();
             metaWindow.change_workspace_by_index(index,
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index 9d92f7b10..96fd52bc5 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -410,7 +410,7 @@ WorkspaceThumbnail.prototype = {
             // the move itself could cause a workspace change if the window enters
             // the primary monitor
             if (metaWindow.get_monitor() != this.monitorIndex)
-                metaWindow.move_frame(true, this._portholeX, this._portholeY);
+                metaWindow.move_to_monitor(this.monitorIndex);
 
             metaWindow.change_workspace_by_index(this.metaWorkspace.index(),
                                                  false, // don't create workspace